Skip to content

zlib: fix memory leak for invalid input#22713

Closed
addaleax wants to merge 3 commits intonodejs:masterfrom
addaleax:fix-zlib-memory-leak
Closed

zlib: fix memory leak for invalid input#22713
addaleax wants to merge 3 commits intonodejs:masterfrom
addaleax:fix-zlib-memory-leak

Conversation

@addaleax
Copy link
Member

@addaleax addaleax commented Sep 5, 2018

Don’t toggle the weak/strong reference flag from the error
handler, that’s too confusing. Instead, always do it in the
code that handles the write call.

Fixes: #22705

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@addaleax
zlib: fix memory leak for invalid input
2be5eb6 
Don’t toggle the weak/strong reference flag from the error
handler, that’s too confusing. Instead, always do it in the
code that handles the write call.

Fixes: nodejs#22705
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Sep 5, 2018

@addaleax build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/803/pipeline

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. zlib Issues and PRs related to the zlib subsystem. labels Sep 5, 2018
@addaleax addaleax mentioned this pull request Sep 5, 2018
Closed
@mscdex
Copy link
Contributor

mscdex commented Sep 5, 2018 •
edited
Loading

Why did Travis fail but the other checks show as passing? Is the test flaky or are the checks not reporting the correct status?

@addaleax addaleax added the fast-track PRs that do not need to wait for 72 hours to land. label Sep 5, 2018
@addaleax
Copy link
Member Author

addaleax commented Sep 5, 2018

@mscdex Flakyness, yes – should be fixed now. :)

CI: https://ci.nodejs.org/job/node-test-pull-request/17037/

I’d like to fast-track this, since it’s not a complex fix and it would be good to have this in 10.10.0 (fyi @targos). Please 👍 if you agree.

@addaleax
Copy link
Member Author

addaleax commented Sep 5, 2018 •
edited
Loading

New CI: https://ci.nodejs.org/job/node-test-pull-request/17040/ (:heavy_check_mark:)

@addaleax
Copy link
Member Author

addaleax commented Sep 6, 2018

Landed in 0c30d0e

@addaleax addaleax closed this Sep 6, 2018
@addaleax addaleax deleted the fix-zlib-memory-leak branch September 6, 2018 08:55
addaleax added a commit that referenced this pull request Sep 6, 2018
@addaleax
zlib: fix memory leak for invalid input
0c30d0e 
Don’t toggle the weak/strong reference flag from the error
handler, that’s too confusing. Instead, always do it in the
code that handles the write call.

Fixes: #22705

PR-URL: #22713
Reviewed-By: James M Snell <jasnell@gmail.com>
targos pushed a commit that referenced this pull request Sep 6, 2018
@addaleax @targos
zlib: fix memory leak for invalid input
8e542ea 
Don’t toggle the weak/strong reference flag from the error
handler, that’s too confusing. Instead, always do it in the
code that handles the write call.

Fixes: #22705

PR-URL: #22713
Reviewed-By: James M Snell <jasnell@gmail.com>
@targos targos mentioned this pull request Sep 6, 2018
Merged
This was referenced Sep 6, 2018
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnell jasnell jasnell approved these changes

Assignees

No one assigned

Labels

c++ Issues and PRs that require attention from people who are familiar with C++. fast-track PRs that do not need to wait for 72 hours to land. zlib Issues and PRs related to the zlib subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Memory leak when using zlib.inflate to inflate invalid data v10.9.0

4 participants

@addaleax @nodejs-github-bot @mscdex @jasnell